From: Peter Michael Green Date: Wed, 30 Jul 2025 00:39:05 +0000 (+0000) Subject: Manual merge of version 8.0.6+dfsg-1+rpi1 and 9.0.2+dfsg-1 to produce 9.0.2+dfsg... X-Git-Tag: archive/raspbian/9.0.2+dfsg-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4ccede2adc8cb84890632e6978784f51dc4eb78b;p=kicad.git Manual merge of version 8.0.6+dfsg-1+rpi1 and 9.0.2+dfsg-1 to produce 9.0.2+dfsg-1+rpi1 --- 4ccede2adc8cb84890632e6978784f51dc4eb78b diff --cc bitmap2component/CMakeLists.txt index c0743e97,40d927df..99446cf9 --- a/bitmap2component/CMakeLists.txt +++ b/bitmap2component/CMakeLists.txt @@@ -52,9 -52,9 +52,10 @@@ add_executable( bitmap2component WIN32 target_link_libraries( bitmap2component common + kicommon ${wxWidgets_LIBRARIES} potrace + atomic ) if( APPLE ) diff --cc debian/changelog index 87d2624f,0e82a314..5cf678a0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,72 +1,80 @@@ - kicad (8.0.6+dfsg-1+rpi1) trixie-staging; urgency=medium ++kicad (9.0.2+dfsg-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 6.0.0+dfsg1-2+rpi1 by Peter Michael Green at Sun, 09 Jan 2022 17:43:33 +0000] + * Link with libatomic. + * Fix clean target. + - -- Raspbian forward porter Sat, 26 Oct 2024 23:26:56 +0000 ++ -- Raspbian forward porter Fri, 30 May 2025 10:05:34 +0000 ++ + kicad (9.0.2+dfsg-1) unstable; urgency=medium + + * [2c5aa4f] New upstream version 9.0.2+dfsg + * [1e1cda8] d/copyright: Replace old FSF address with URL + + -- Carsten Schoenert Sat, 10 May 2025 11:34:36 +0200 + + kicad (9.0.1+dfsg-1) unstable; urgency=medium + + [ Carsten Schoenert ] + * [23d6e54] New upstream version 9.0.1+dfsg + * [3682fc3] d/control: Increase Standards-Version to 4.7.2 + + No further changes needed. + * [3f344b9] d/kicad-demos.install: Add new subfolder to install + + [ RICCIARDI-Adrien ] + * [1c64540] Rebuild patch queue from patch-queue branch + + Updated patch: + fixes/Adjusting-content-in-the-desktop-files.patch + See also + https://salsa.debian.org/electronics-team/KiCad/kicad/-/merge_requests/2 + + [ John Paul Adrian Glaubitz ] + * [5f03e00] d/rules: Add needed linking for armel m68k powerpc sh4 + (Closes: #1098791) + + -- Carsten Schoenert Fri, 04 Apr 2025 16:07:28 +0200 + + kicad (9.0.0+dfsg-1) unstable; urgency=medium + + * [90a9b14] d/gbp.conf: Filter out one more PDF file + * [a4131fc] New upstream version 9.0.0+dfsg + (Closes: #1098475) + * [651264e] d/control: Add new needed Build-Deps + * [46e8aec] d/kicad.install.in: Add libkiapi to sequencer + * [80f8e81] d/rules: Add new CMAKE option to DEB_KICAD_CMAKE_OPTS + * [5341af1] d/s/lintian-overrides: Ignore non relevant Lintian detection + * [f2b0e1a] d/copyright: Update copyright information + * [39aae5e] d/kicad.lintian-overrides: Adjust content due changes + * [f3a620c] d/README.vendorded-stuff: Some more notes + * [83f540d] d/rules: Remove more unwanted files in kicad-demos + * [c50fcfa] d/rules: Use upper case, not one char variable names + * [3104e18] d/control: Increase Standards-Version to 4.7.1 + + No further changes needed. + * [b04b0d0] d/control: Bump Bre/Sug/Rec versions to >=/<< 9.0.0~ + * [5069e37] d/t/control: Sort entries by wrap-and-sort + + -- Carsten Schoenert Sun, 23 Feb 2025 17:00:42 +0200 + + kicad (8.0.8+dfsg-1) unstable; urgency=medium + + * [414e014] New upstream version 8.0.8+dfsg + + -- Carsten Schoenert Sun, 12 Jan 2025 10:43:51 +0200 + + kicad (8.0.7+dfsg-2) unstable; urgency=medium + + * [7ee0ffc] d/rules: Ignore dh_dwz on armhf + This architecture is providing too less memory dwz could be running + succesfully. + (Closes: #1091284) + + -- Carsten Schoenert Thu, 26 Dec 2024 11:30:34 +0200 + + kicad (8.0.7+dfsg-1) unstable; urgency=medium + + * [b0daff1] New upstream version 8.0.7+dfsg + + -- Carsten Schoenert Tue, 24 Dec 2024 13:46:07 +0200 kicad (8.0.6+dfsg-1) unstable; urgency=medium diff --cc debian/rules index e855577d,3ed21db6..ba0ed814 --- a/debian/rules +++ b/debian/rules @@@ -9,6 -9,11 +9,11 @@@ include /usr/share/dpkg/buildflags.m CFLAGS+=$(CPPFLAGS) CXXFLAGS+=$(CPPFLAGS) + # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k powerpc sh4)) ++ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k powerpc sh4)) + export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed + endif + # out of tree build folder for kicad application DEB_BUILD_DIR=debian/build # default install folder @@@ -157,12 -163,8 +164,18 @@@ override_dh_makeshlibs -Xlibs3d_plugin_vrml \ -X_pcbnew.$(DEB_HOST_MULTIARCH) +PLAIN_UPSTREAM_VERSION=$(word 1,$(subst +, ,$(DEB_VERSION))) + +override_dh_auto_clean: + dh_auto_clean + rm -rf $(DEB_BUILD_DIR) + -sed -i 's/^set( KICAD_SEMANTIC_VERSION.*/set( KICAD_SEMANTIC_VERSION "$(PLAIN_UPSTREAM_VERSION)" )/g' CMakeModules/KiCadVersion.cmake + -sed -i 's/^:revdate: .*/:revdate: @REVDATE@/g' `find . -name '*.adoc'` + rm -f eeschema/sch_text_help_md.h pcbnew/dialogs/panel_setup_rules_help_md.h + rm -f bitmaps_png/icons/kicad.xpm ++ + override_dh_dwz: + # dh_dwz is running out of memory on armhf, see #1091284 + ifneq ($(DEB_BUILD_ARCH),armhf) + dh_dwz + endif diff --cc eeschema/CMakeLists.txt index 419fe66b,8b38c7e2..776fd8fe --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@@ -519,18 -562,10 +562,11 @@@ add_executable( eeschema WIN32 MACOSX_B set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"kicad_sch\";BUILD_KIWAY_DLL" ) + target_link_libraries( eeschema - #singletop # replaces common, giving us restrictive control and link warnings. - # There's way too much crap coming in from common yet. - gal - common - argparse::argparse + kicommon ${wxWidgets_LIBRARIES} + -latomic ) # the main Eeschema program, in DSO form. diff --cc kicad/CMakeLists.txt index 8d5dc07c,9d001ef2..10f8b22f --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@@ -147,9 -169,9 +169,10 @@@ else( common gal common #repeated due to a circular dependency between gal and common + kicommon core ${wxWidgets_LIBRARIES} + -latomic ) target_link_libraries( kicad-cli